app/models/agent.rb

@@ -10,6 +10,7 @@ class Agent < ActiveRecord::Base

                   include AssignableTypes
              

                   include MarkdownClassAttributes
              

                   include JSONSerializedField
              

                +  include RDBMSFunctions
              

                 
              

                   markdown_class_attributes :description, :event_description
              

                 
              
@@ -127,7 +128,8 @@ class Agent < ActiveRecord::Base

                     if keep_events_for == 0
              

                       events.update_all :expires_at => nil
              

                     else
              

                -      events.update_all "expires_at = DATE_ADD(`created_at`, INTERVAL #{keep_events_for.to_i} DAY)"
              

                +      #events.update_all "expires_at = DATE_ADD(`created_at`, INTERVAL #{keep_events_for.to_i} DAY)"
              

                +      events.update_all "expires_at = " + rdbms_date_add("created_at","DAY",keep_events_for.to_i) 
              

                     end
              

                   end
              

                 
              

lib/rdbms_functions.rb

@@ -0,0 +1,13 @@

                +module RDBMSFunctions
              

                +  def rdbms_date_add(source, unit, amount)
              

                +    adapter_type = connection.adapter_name.downcase.to_sym
              

                +    case adapter_type
              

                +      when :mysql
              

                +        "DATE_ADD(`#{source}`, INTERVAL #{unit} #{AMOUNT})"
              

                +      when :postgresql    
              

                +        "(#{source} + INTERVAL '#{amount} #{unit}')"
              

                +      else
              

                +        raise NotImplementedError, "Unknown adapter type '#{adapter_type}'"
              

                +    end
              

                +  end
              

                +end